Merge changes Ibadc31b0,I5b453a68

* changes:
  Move BluetoothInCallService to separate package (2/2)
  Move BluetoothInCallService to separate package (1/2)