Merge changes from topic "fix-b-273252382-connect-external-device" into...

Merge changes from topic "fix-b-273252382-connect-external-device" into udc-dev am: 54f185d4 am: dc776251

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



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