[automerger skipped] Merge changes I912e8d21,I7239d56b,Ic67d0078,I8394f580...

[automerger skipped] Merge changes I912e8d21,I7239d56b,Ic67d0078,I8394f580 into sc-qpr1-dev am: a1c0da71 am: 82a98814 -s ours

am skip reason: Merged-In I912e8d21d19be0a82d7f3b3f8398808f335b42de with SHA-1 007eb0da is already in history

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

Change-Id: Ia8c18ebc91917a122163790ef112255525f61a53