[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-344a4e064be547fabf508c6fde165c12" into sc-v2-dev-plus-aosp am: 7c9dca14 -s ours

am skip reason: Merged-In I84870436d5d8c6f24a57d4e54b848730a4c03778 with SHA-1 771f6d64 is already in history

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

Change-Id: I08483aaff89048e71ebaa1da3e57b3303d1c07f0