[automerger skipped] Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-mainline-prod am: 8cc7903a -s ours am: 4b2bdd78 -s ours am: 804d225b -s ours am: 58c6b41e -s ours am: 1e87f374 -s ours

am skip reason: Merged-In Ib34c0b56ef52f5ee2deceb84b02cd0ff73d8181d with SHA-1 807f4cfc is already in history

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



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