[automerger skipped] Merge "Fix AudioDeviceInventory#disconnectLeAudio" am:...

[automerger skipped] Merge "Fix AudioDeviceInventory#disconnectLeAudio" am: cfe3dc56 -s ours am: 26943c4c -s ours am: 63653048 -s ours

am skip reason: Merged-In Ifd74c244e19f5e7f92fdbd8f7d20cd99a054425a with SHA-1 695a2648 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2185396



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