Merge "Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc1924 am: 6affc270" into rvc-d1-dev-plus-aosp am: d26aca69 am: 64002896

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

Change-Id: Id95a1e250d000a7e9e17c90ef9384c5a940ed6ea