Merge "Revert "BluetoothInCallService: Check null in OnCallRemoved""