[automerger skipped] Merge changes I2440a161,I3e478b11 into sc-dev am: ce6d9b4261 -s ours am: 220896c23f -s ours am: ae013053d3 -s ours
am skip reason: Merged-In I2440a161c70076850479c562c7c9e6dc8d756236 with SHA-1 74eaabead9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16051823
Change-Id: I794a372ad492ce08f662a8cc29d682aa5357bb3e
This commit is contained in: