Merge changes I2292c1cb,I8f60c137 into rvc-dev am: 1115ecda57 am: f4e7d32a7a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887

Change-Id: I56b761cf4c35b0f7a84ad210735471ca3d30038d