[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 2a073f08 -s ours am: 3981fd41 -s ours am: 9af8170c -s ours am: 97038106 -s ours am: 80b30783 -s ours

am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d850458 is already in history

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



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