Merge "Bluetooth: Prevent BT crash using adb commands" am: 1354fd3280
am: 416faf49ee

Change-Id: I46d962b6134be098329f92fa1c8e59dcbdca92cf