[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444" into stage-aosp-udc-ts-dev am: 85105d09 am: fd246a3a am: bb32140a am: 2e49ba2b -s ours am: 51b6d0a3 -s ours

am skip reason: Merged-In I0dcac312ac4516a078b2742721e3a19074da52b1 with SHA-1 35621098 is already in history

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



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