[automerger skipped] Merge changes from topic "presubmit-am-5e22897cb56644e4abaab85d2e0ec30e-sc-v2-dev" into sc-v2-dev-plus-aosp am: fefc274c -s ours

am skip reason: Merged-In I924f917fbf757d2c3866fcd60de2fbfccae2eb6a with SHA-1 88f4dbce is already in history

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

Change-Id: I7ebba3b932d53d0394da8292bc4a66f7363c5118