[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-8db26f97255a47d789da3cac64a835f3" into sc-v2-dev-plus-aosp am: 0844d577 -s ours am: 1843e644 -s ours am: 621bcd10 -s ours

am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 3072d98c is already in history

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

Change-Id: I26c58a9dc0ff75220cb671d62d6971d84005a7b9