[automerger skipped] Merge changes from topic "bug158482162_rvc-qpr-dev" into rvc-qpr-dev am: 3a9dd32f -s ours am: 29bc5dfb -s ours am: 9d95303f -s ours

am skip reason: skip tag Change-Id I11d863229c4d62a058aaf37446a694b9c73ae5b8 with SHA-1 dabbcf59 is already in history

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

Change-Id: Id178899e8c1f8ed7f77cd006d54c82a116e3e184