[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp am: d53d3986 -s ours am: 8572affd -s ours

am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 52e0dafc is already in history

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

Change-Id: I3d6c10ccd2f890a99c54f1817e660ceade0bfce8