Merge changes Iefe84120,I482cce6d into udc-dev am: b7db5076 am: b4a2adca...

Merge changes Iefe84120,I482cce6d into udc-dev am: b7db5076 am: b4a2adca am: 58d87d51 am: 0307da55

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



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