Merge "Revise BT active device detection"
am: 46d60dd323

Change-Id: I14b8ea8c0976182f80540782dc715e7494118fc5