[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: f6562730 -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: I47a26d38ea69fa26e9907b510cb38d1d53d85d88