Merge "[automerger skipped] Merge changes from topic...

Merge "[automerger skipped] Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-qpr1-dev am: 74939083 am: b45d936f -s ours am: 945fca32 -s ours am: 5cdeed0e -s ours" into tm-d1-dev-plus-aosp am: de794b23 -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: Ia4344637b13848122500d2271256fad1a79c18b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>