Merge changes from topic "am-ab4e3d279f8b4e678c68bca55d7c8074" into...

Merge changes from topic "am-ab4e3d279f8b4e678c68bca55d7c8074" into udc-qpr-dev-plus-aosp am: df8f0dd1 -s ours

am skip reason: Merged-In I88b4e5dfd16b1efbe87bf21459755ff2b4900d1f with SHA-1 1129bf75 is already in history

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



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