Merge changes from topic "am-d004569a08d84c16ad60f55981ae015c" into rvc-qpr-dev-plus-aosp am: 636ed9a2

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

Change-Id: Ice22ca489c4eb516a72b373d2e6c3fe48b087750