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

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



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