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

Change-Id: Ia12feb3f9d86c71634bda442e07eccd092972f0e