[automerger skipped] Merge changes from topic "192281479-scdev" into sc-dev am: c25d45b0 am: 4bedaf19 am: fa04815b -s ours

am skip reason: Merged-In I6bfd2c880b3f4df1238c2d746eec49e36a931fa6 with SHA-1 6eecee9b is already in history

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

Change-Id: Ia2b5c0f2353b46ad8eaeef4410643ff623dcbccd