[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-8c7a56762e85448ab5d8dd1b8eab00d7" into sc-v2-dev-plus-aosp am: fcf7870b -s ours am: b12be0b2 -s ours

am skip reason: Merged-In I793f76a23978cbbbbde2d16e8a522615174bcdd5 with SHA-1 11bd6448 is already in history

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

Change-Id: I1000d125ee0e56f475abd82a2497f6f3443dc093