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: 6f0b98e9

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



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