Merge changes from topic "am-9913fa96337e4f3cb79ffb32d3a1656e" into rvc-d1-dev-plus-aosp am: 2bc862f7 am: 7e002be0

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

Change-Id: Iec237a4f9673c87f1cc7c1d4f77d3e704684b04a