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

Merge changes from topic "am-aca13833ae084f9db376a5772c91ec4b" into udc-qpr-dev-plus-aosp am: 5136345c -s ours

am skip reason: Merged-In I6f4d2a35e89bbed7bd9e07bf5cd3e2d68b20af9a with SHA-1 bf7fbbcc is already in history

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



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