Merge "A2DP switch device refactor" am: 5f91507b2b

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

Change-Id: Id58c1afbd4899afff2d20671ddac1345e671eb90