[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into tm-dev am: bc7b243d -s ours am: ac798924 -s ours am: 4bd2f85a -s ours am: 465ecdc8 -s ours

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

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



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