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

Change-Id: Ibda9f44ee16b3c3f91ce8a83325e0790e193e725