[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-9ac0d720d9e1426daa03a0d40542b907" into sc-v2-dev-plus-aosp am: b5e3ae42 -s ours

am skip reason: Merged-In Ida0d7637e32b4b9064cddbd3e8d8d4b8d347023c with SHA-1 c7022e19 is already in history

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

Change-Id: I7688e2ba82fcaf592e45f3be765fe8549b14e882