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

Merge "Merge changes I30a2fa4f,I1abd1561 into rvc-dev am: 5bbeb33e am: 0eb4ee71" into rvc-d1-dev-plus-aosp am: 9c0918ca am: 665eb4a5

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

Change-Id: I7c66ba6b8d2382aa019fa2616d2f932b75b5a6ca