Merge "Revert "UpdateAbility: Implement BluetoothInCallService and its ...""