Merge changes from topic "am-924f2dd44e864177b21162ff778e62b3" into...

Merge changes from topic "am-924f2dd44e864177b21162ff778e62b3" into udc-qpr-dev-plus-aosp am: 9c022cde -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 e79cbff7 is already in history

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



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