[automerger skipped] Merge changes from topic "192281479-scdev" into sc-dev am: c25d45b0 am: db963e09 am: 2a3b37cb -s ours

am skip reason: Merged-In I6bfd2c880b3f4df1238c2d746eec49e36a931fa6 with SHA-1 89daef04 is already in history

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

Change-Id: I6f7464b46a7bab38bc1fd623fc61e487d3e37ca5