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

Change-Id: I67b40cb849bc4f16d959d2b3bc9a24807424422c