[automerger skipped] Merge "Add prepareToDisconnectExternalDevice." am:...

[automerger skipped] Merge "Add prepareToDisconnectExternalDevice." am: 4109a126 am: 63ad2786 am: 614f993f -s ours am: 02bb0ff2 -s ours am: 89aecf92 -s ours

am skip reason: Merged-In Ie5868ac5efedb3dbdd8b4c2e3225c0c4085806a1 with SHA-1 c004863d is already in history

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



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