[automerger skipped] Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444" into stage-aosp-udc-ts-dev am: 85105d09b7 am: fd246a3aac am: bb32140afc am: 2e49ba2b93 -s ours

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

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

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