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

Change-Id: Ia9acd7a8cc740abf1ca5b47b3f5910a3b681b2c1