Merge changes from topic "am-7d2d9cdc160045768d103b187e51cab6" into...

Merge changes from topic "am-7d2d9cdc160045768d103b187e51cab6" into rvc-qpr-dev-plus-aosp am: 42781fa8

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

Change-Id: Ib1379c9c43bcdc63e3980f8d909ea07b8d757a45