Merge "Remove dependency on telephony-common from Bluetooth"