[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-3081ec444acb4d69974a1b8546d081d1" into rvc-qpr-dev-plus-aosp am: 5d508893 -s ours

am skip reason: Change-Id I7d98ab425852ffa064c68f5dc50bd1f5a4a49ab9 with SHA-1 472144c3 is in history

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

Change-Id: I0b1cd2d835c74dd9dcbfc636a61960d7783350f7