Merge "Merge changes Ia719fce3,If1a64a93,I90b025f5,I54449898,I32b7b585 into...

Merge "Merge changes Ia719fce3,If1a64a93,I90b025f5,I54449898,I32b7b585 into udc-dev am: 43d2a6cf" into udc-dev-plus-aosp am: 5279a5d9 am: 69fc5b35 am: 24609738

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



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