[automerger skipped] Merge "Avoid Bluetooth gets turned on by enableBle" am:...

[automerger skipped] Merge "Avoid Bluetooth gets turned on by enableBle" am: 99f31b98 -s ours am: 4c40734d -s ours

am skip reason: Merged-In Ic9df612ec0e396932df2fb3bf3a5874bd4e7443c with SHA-1 cc89e936 is already in history

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

Change-Id: I0e977fcc0316b0a33fbb2b3d336600a606b04120