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

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

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



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