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

Change-Id: I19c93d61d202baced21afb93f25cb6dfbaa32b29