Merge "Remove active devices when the BT profile disconnects" am: 785457ec7b
am: 531945f7a6

Change-Id: Ie81abc1a2c3bda36dd8cbd18f24cbd1f7e118d7c