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

Change-Id: Ib081a5ad65fcd7141fa70dcc1989fefe4f4e7459