[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-mainline-prod am: 8cc7903a -s ours am: 4b2bdd78 -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: I3033a5f41d48e79e47e665e5fe19d3fdf5cfb955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>