Merge changes from topic "am-baeaceb929f54fadb7e0f91f6489a7ee" into rvc-qpr-dev-plus-aosp am: 707d7c1b

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

Change-Id: Ia9635c18ce4a5a03bf75c4bb1088eb21d4fcaff1