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

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

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