[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-b1be03bda51148b4a765c48e0da0ffbc" into rvc-qpr-dev-plus-aosp am: e0035f0d -s ours

am skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f490 is in history

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

Change-Id: I6f72ad6bc83a15e0bb8fa7d865de1bff5da483a1