[automerger skipped] Merge "Disable Bluetooth if BLE was disabled while...

[automerger skipped] Merge "Disable Bluetooth if BLE was disabled while enabling" am: 57e4e9be am: 8ba199ce -s ours am: 177f4d01 -s ours

am skip reason: Change-Id I4f92581465de81ffe9b45fb042b5cc43e5ab4136 with SHA-1 4247e445 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322638

Change-Id: I68e4fcad192fe275b84509d1dbbe1ed07a5c4614