[automerger skipped] Merge changes from topics "b231496105",...

[automerger skipped] Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev am: 44893b71 am: 500d27a1 am: 0d49574c -s ours am: 16f54919 -s ours am: aae29959 -s ours am: b1410455 -s ours

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

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



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