Merge changes from topic "am-8890be08bd9b4c77a6b9786a47fd66a9" into...

Merge changes from topic "am-8890be08bd9b4c77a6b9786a47fd66a9" into rvc-qpr-dev-plus-aosp am: 841cf2f7

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

Change-Id: Id49b7de12dc9191f63237c0810e23c960e4b02de