[automerger skipped] Merge changes from topic "presubmit-am-0527d8f1cf0a4d4ba0831323b572842f-sc-v2-dev" into sc-v2-dev-plus-aosp am: a719a69404 -s ours am: 69514682c2 -s ours
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 b8cd0a4286 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344015
Change-Id: I9172ac890c89cc026789b6839c7ac569fb7c6747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: