Merge "Update BluetoothPhoneServiceImpl to handle childless conference calls." into mnc-dev