[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-34a8ba0b26b74d1daf2868b91d148909" into sc-v2-dev-plus-aosp am: 84603031 -s ours

am skip reason: Merged-In I57fa88c6f45adca9e3301b39e868bd127644b76f with SHA-1 975e9ab4 is already in history

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

Change-Id: I8117c560b230cae953847dd8ad400e592a8346f3