Merge "Update BluetoothProfileConnector to invoke service disconnections with correct profile ID" am: d8b457545a am: 8b3ceb7640
am: b4b40f284f

Change-Id: Id1d9821c33ff0eddde0834c96dc2f20063c70b64