[automerger skipped] Merge changes from topic "b196691596" into sc-dev am:...

[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd am: 17a68e2b -s ours am: 258a30ee -s ours

am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 448dd444 is already in history

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

Change-Id: Ia7b4167fe670a65c260276966d23e963068275c4