[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-98af38b71a6140d09aa6a8963d386ea8-sc-v2-dev" into sc-v2-dev-plus-aosp am: c9577081 -s ours

am skip reason: Merged-In I1f1b9a5b8f63d6564c9e121bee7d6d6d697b471d with SHA-1 6c9df302 is already in history

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

Change-Id: I7c9e4c7c177519f2cfef4bc3601b98ae33b7ad32