[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-172fa15a4900438f87529bf46598ea73" into rvc-qpr-dev-plus-aosp am: 3134d7bc -s ours

am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd6911cd is in history

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

Change-Id: I2b24347253d7757911832f630753df83482c38ab