Merge "Merge changes Iebbc5d77,I2bef5f6f into udc-dev am: c6ffe347 am: deabe85d" into udc-d1-dev-plus-aosp am: 14131093

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



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