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

Change-Id: I870a8fc8028456078e00b50b353b5c121ae9854e