[automerger skipped] Merge changes from topic "udc-merge-291102124" into aosp-main-future am: ba758129d3 -s ours am: c84b5c448e -s ours am: f1b9a57d5e -s ours am: b39d469402 -s ours

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

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

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