[automerger skipped] Merge changes from topic "fix-b-273252382-connect-external-device" am: ddd489824d am: 73454c52e0 am: 4ee28d7303 -s ours

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

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

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