Merge "Merge "Track the global setting of BT A2DP on/off" into oc-mr1-dev am: cc2478f90c am: 0047534b7f"