Merge changes I34db56fe,I539b408f,I76155f89 into udc-qpr-dev am: 83dcb849d7 am: d7ba06c414

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

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