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

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

Change-Id: Ic29da5e96cc502220282cff5f40e4ebce1258905