[automerger skipped] Merge changes from topic "udc-merge-291102124" into...

[automerger skipped] Merge changes from topic "udc-merge-291102124" into aosp-main-future am: ba758129 -s ours am: c84b5c44 -s ours

am skip reason: Merged-In Ic5ef401b427b2772e8527b2dc9804781a51125be with SHA-1 92d84c0c is already in history

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



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