Merge changes from topic "am-ee432f9c105e4e2e8edfeb2d532b0939" into rvc-qpr-dev-plus-aosp am: b9e295251c

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

Change-Id: Ifc679ebec18341eb3030274d05c2693201d0e895