[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "fix-b-273252382-connect-external-device" am: 4dbb96f6 am: 1c48cc9f am: ae3e0a1d -s ours

am skip reason: Merged-In I92b5e430326ef0b044e01b9cbd5ec82e9d4c06c3 with SHA-1 ecfafb78 is already in history

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



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