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

[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd -s ours am: de460d15 -s ours am: c22056bb -s ours am: b1914a79 -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: I1e01e5ec646393f58c960e36a867669c15d9d768