Merge changes I76f90d5a,I3d882dcf into udc-dev am: aa3a1395 am: cbf6932f...

Merge changes I76f90d5a,I3d882dcf into udc-dev am: aa3a1395 am: cbf6932f am: d9a760a3 am: 339de3a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22656963



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