Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" into stage-aosp-master