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

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

Change-Id: Iff9cdaeeddb5cf5492c7d594af08c6981e51858e