Merge "Remove unneccessary a2dpDeviceChanged variable" am: 98919aff22 am: 6fda0e3638

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1646948

Change-Id: I7bb200d8ea1be541aad0162f3b3df22367ab3330