[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp am: a719a694 -s ours am: 69514682 -s ours am: 0e733588 -s ours

am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a42 is already in history

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



Change-Id: Ib3af80b153aa1b4d2104115e390faa8de7b02d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>