[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-ff7699f855c14d1ca2c8a3438a9402f0" into sc-v2-dev-plus-aosp am: 85162b65 am: 7372e21e -s ours

am skip reason: Merged-In I5ddeaffac4fe26316f084505d692d2fc80cff467 with SHA-1 d910c284 is already in history

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

Change-Id: I349cd552b80e4301943363759c93e737727fe351