Merge changes from topic "fix-b-273252382-connect-external-device" am: ddd489824d am: 73454c52e0

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

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