Merge "A2DP switch device refactor" am: 5f91507b2b am: bad9226cb7 am: ff384b67cf

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

Change-Id: I2a3b737d10a9f26c73fa3914837094a4b763cbf5