am 044c27df: am 45c9fa94: Merge "Update BluetoothPhoneServiceImpl to handle childless conference calls." into mnc-dev

* commit '044c27df76b49b9cef7c23d6c8641e0787b3ab07':
  Update BluetoothPhoneServiceImpl to handle childless conference calls.