Merge changes from topic "am-18a3c6d653d44683b65118226385d997" into...

Merge changes from topic "am-18a3c6d653d44683b65118226385d997" into rvc-qpr-dev-plus-aosp am: 1aa790bc

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

Change-Id: I49ef784feaccfdc78d0259abd91eb39ec53e2703