Merge "Merge "Make BluetoothHeadsetClient and associated functions @SystemApi" am: e70578157d am: 881867d5e1 am: ab0e7cd2cf am: f15afa4672"