Merge changes Iefe84120,I482cce6d into udc-dev am: b7db507661

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

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