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

Merge changes Iefe84120,I482cce6d into udc-dev am: b7db5076 am: bf5dddca am: 3a0b26df am: dee0cf68

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



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