[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-bed54c4b3fbf4171a0599b645919df07" into tm-qpr-dev-plus-aosp am: ccf94159 -s ours am: 24d4a8c6 -s ours

am skip reason: Merged-In Id68a28e9dc12f71286e29822d4b88be88ab03653 with SHA-1 18e9fa72 is already in history

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



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