[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "fix-b-273252382-connect-external-device" am: ddd48982 am: 73454c52 am: 4ee28d73 -s ours am: 23ca174a -s ours

am skip reason: Merged-In I3381dd29c5922bf31fa3a8ae6fa273597e8333a1 with SHA-1 fe09942d is already in history

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



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