[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-c548fd9918a542cebc9e4b0f87a44f0b" into sc-v2-dev-plus-aosp am: a297564a -s ours am: 39c0f0dc -s ours

am skip reason: Merged-In Id6ad9f199964dd416a52c169a3e30713389479cc with SHA-1 d8018445 is already in history

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

Change-Id: I568e7e3b42ce4749a8346114ce7527e7ab7ce775