[automerger skipped] Merge "Merge changes I037517d9,Ic603b271,I47fe530f into...

[automerger skipped] Merge "Merge changes I037517d9,Ic603b271,I47fe530f into sc-qpr1-dev am: 44e5c9a0" into sc-v2-dev am: 04600048 -s ours am: 5b2972f3 -s ours

am skip reason: Merged-In Ic603b2711c19299f01271131062765255451310a with SHA-1 cab1bbff is already in history

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

Change-Id: Ib5ad8d3f9998d73188aea50eb732b67adce3e904