Merge changes from topic "am-83a752f2ff634575ad8287d3b212c232" into...

Merge changes from topic "am-83a752f2ff634575ad8287d3b212c232" into udc-qpr-dev-plus-aosp am: f701c379 -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: I350586121b28e8d3f44011f85ee16114bdb08136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>