Merge changes from topic "am-07be7a7778dd4368826e995289e2abee" into...

Merge changes from topic "am-07be7a7778dd4368826e995289e2abee" into rvc-qpr-dev-plus-aosp am: 839c4c94

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

Change-Id: Ie54870b6bfd2b07f418c16c18fcc8d17c517d101