Merge changes from topic "fix-b-273252382-connect-external-device" am: 4dbb96f6 am: 1c48cc9f

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2516266



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