Merge "Bluetooth: Prevent BT crash using adb commands" am: f619709ad0 am: 24baeb4cd1
am: 2a23ba264b

Change-Id: I0999e04bd754604cfa28306c39741e3a3573ddcd