[automerger skipped] Merge changes I2440a161,I3e478b11 into sc-dev am:...

[automerger skipped] Merge changes I2440a161,I3e478b11 into sc-dev am: ce6d9b42 -s ours am: 220896c2 -s ours am: ae013053 -s ours am: 50a7d24d -s ours

am skip reason: Merged-In I2440a161c70076850479c562c7c9e6dc8d756236 with SHA-1 74eaabea is already in history

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

Change-Id: Ibe6dd3660c1a1f874bd0284f101c43eb271072c8