[automerger skipped] Merge "A2DP switch device refactor" am: 5f91507b am:...

[automerger skipped] Merge "A2DP switch device refactor" am: 5f91507b am: bad9226c am: ff384b67 am: 0ae3b84d -s ours

am skip reason: Merged-In I65c6561969d443e80f0a49256770279cd0959352 with SHA-1 7c17ba0c is already in history

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

Change-Id: If0236de8e4122d20784c6b723baacc8d3f715232