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

Merge "Merge changes I50d5ce3a,I84a636ba into rvc-dev am: 4181d96a am: a770c943" into rvc-d1-dev-plus-aosp am: ccf5fb26 am: 4da5c7b0

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

Change-Id: Ieed6777e7bd5b98cf1a05a68bfb25562667f87cf