Merge changes from topic "am-565ab711edad47d39e14594ddee85d80" into...

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