[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-48306752669a47cd8b4809ed762bff75" into sc-v2-dev-plus-aosp am: f552a742 -s ours am: fd42c444 -s ours

am skip reason: Merged-In I4edab8588421b3e341cf3bde07e989ff5e651cfe with SHA-1 19660ca3 is already in history

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

Change-Id: I8ff14dc617bb71ac2f62325507e5b552b6b3377d