[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "add-thread-to-udc-mainline-prod" into udc-mainline-prod am: 669634c3 -s ours

am skip reason: Merged-In I7e4bf260c03dd0500725fec068747e3b3d05820c with SHA-1 125dffe1 is already in history

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



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