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

Change-Id: Iaa02ab736989e55660ad6813fcaa97e2b411a27e