Merge "Merge changes I30a2fa4f,I1abd1561 into rvc-dev am: 5bbeb33e am:...

Merge "Merge changes I30a2fa4f,I1abd1561 into rvc-dev am: 5bbeb33e am: c3d6c281 am: ae8b7640" into rvc-qpr-dev-plus-aosp am: 7ea05242

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

Change-Id: Ia59d8302c47daf334994674f5e2edb6b089995cb