[automerger skipped] Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444" into stage-aosp-udc-ts-dev am: 85105d09b7 am: fd246a3aac -s ours am: b877ba77b0 -s ours am: 540260344d -s ours am: cffc2b4b5e -s ours

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

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

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