[automerger skipped] Merge changes I635afaaf,Icdd62155 into sc-dev am:...

[automerger skipped] Merge changes I635afaaf,Icdd62155 into sc-dev am: 9882c62f am: 0856bdbf -s ours am: 1bc70104 -s ours

am skip reason: Merged-In I635afaaf9185c32a9f04851453ac7c0d20612c11 with SHA-1 0abf3cdc is already in history

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

Change-Id: I3c95045dd1b52cde2ffda365af56a6becdff22d1