Merge "Merge changes I50d5ce3a,I84a636ba into rvc-dev am: 4181d96a am:...

Merge "Merge changes I50d5ce3a,I84a636ba into rvc-dev am: 4181d96a am: a770c943 am: c107fa65" into rvc-qpr-dev-plus-aosp am: 7e511134

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

Change-Id: Ia700d957d706b8bc7849cb41ed10e572d5fa387c