[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 -s ours am: b877ba77 -s ours am: 54026034 -s ours

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

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



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