[automerger skipped] Merge changes from topic "am-5b3500c6a7f543f9abf695f3343f61c0" into sc-dev am: a56d973a -s ours am: 957199c1 -s ours

am skip reason: Merged-In I107c329d4d7130d488772166eae8b5e7aaa2ff04 with SHA-1 8f2f98f8 is already in history

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

Change-Id: I3249953bb4fdc1e0ad65f12703abc662b454d294