[automerger skipped] Merge changes from topic "presubmit-am-b14a56dfc63a4a75a36aa0dcff9f1332" into sc-v2-dev-plus-aosp am: 55b3a401 -s ours am: 870486cc -s ours am: 8de48e9f -s ours

am skip reason: Merged-In If5ce110b506b6b4229dd6ea5a39542369742bc51 with SHA-1 79f9dd01 is already in history

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

Change-Id: I8ba976f1faf46d0eb970f5453eec3d97d2af2cf6