Merge "Remove bluetooth.a2dp from matrix as deprecated HAL"
am: c95ca1b9d2

Change-Id: I60a7596734f13105039f5768547f5fc101cbd683