[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-mainline-prod am: ae836954 -s ours am: 0fbaf3f7 -s ours am: 36d7a42c -s ours am: 06a9fed4 -s ours am: 856b2b63 -s ours

am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa4 is already in history

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



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