Merge changes from topic "am-285d5d38055c4c72b656b779a3327223" into...

Merge changes from topic "am-285d5d38055c4c72b656b779a3327223" into udc-qpr-dev-plus-aosp am: c1c9b521 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a is already in history

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



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