Merge changes If8d5b906,I861d6ef7 into rvc-dev am: 70f970f80b am: 9848ecebd2 am: 5cc9fc78d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871517 Change-Id: I2fefe40d98431cd580ec7065bef305134140d933
This commit is contained in: