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

Merge changes from topic "am-b0d172e19d1f49a69f84608c9f03128c" into udc-qpr-dev-plus-aosp am: 1c7c9242 -s ours

am skip reason: Merged-In I0da18c631eb5e4844a48760c7aaedab715a0bfed with SHA-1 a6f44e91 is already in history

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



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