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

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



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