[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-511bbd56532d40a893027c683b6a4446" into sc-v2-dev-plus-aosp am: c530fb1d -s ours

am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0d304b02 is already in history

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

Change-Id: I55e601b9099eabef12ce154d175e851264d872be