[automerger skipped] Merge changes Ic134c432,I5c5c1233 into rvc-qpr-dev am:...

[automerger skipped] Merge changes Ic134c432,I5c5c1233 into rvc-qpr-dev am: 45f8014a am: 8100add1 -s ours

am skip reason: Change-Id Ic134c4326db836e35385f290f996f0d841da693d with SHA-1 819e1209 is in history

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

Change-Id: I63e7dafcacf5f006394137e59ec5bfa9de7a8fa0