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

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

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

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



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