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

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

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