Merge "Update the Bluetooth Active Device state in the Device Manager" am:...
Merge "Update the Bluetooth Active Device state in the Device Manager" am: 5b2fe53a am: 7c7d28cd -s ours
am: 244084dc -s ours
Change-Id: I25f3cc625016c69e0e2c2941b22aacfe87870b01