[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-7620ad0417cd498ea02e09cd0ecc98e9" into sc-v2-dev-plus-aosp am: bd1eff5c -s ours

am skip reason: Merged-In I86456137e6d6ad47f9974da281defc04d20fb32f with SHA-1 7589e541 is already in history

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

Change-Id: If38f19a77c55deb78fa52cdae9c896bc212d1997