Merge "Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a881" into rvc-dev-plus-aosp am: 3cc9f00077

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

Change-Id: I121aa172e6f346ff9aef733ff5c5d187f4fcad7c