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

Merge "[automerger skipped] Merge changes from topic "presubmit-am-596ac78c570647d8a0f30d123eb656a7" into sc-qpr1-dev am: f943201e am: e527f6bc -s ours am: d43e0457 -s ours am: 18b278f5 -s ours am: d77eec1a -s ours am: 538c29a0 -s ours" into udc-dev-plus-aosp am: 372bb072 -s ours am: 3224f4f4 -s ours am: d4e68874 -s ours

am skip reason: Merged-In Idcf54e408722f164d16bf2f24a00cd1f5b626d23 with SHA-1 12c20150 is already in history

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



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