[automerger skipped] Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev am: 44893b71c0 am: 500d27a12c am: 0d49574c94 -s ours am: 16f54919d5 -s ours am: aae29959cc -s ours

am skip reason: Merged-In Idcf5ac9a5401ad8089f5873da1f978fdf9258b5a with SHA-1 61c2d0291b is already in history

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

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