Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444"...

Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444" into stage-aosp-udc-ts-dev am: 85105d09 am: fd246a3a

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



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