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

[automerger skipped] Merge "Avoid Bluetooth gets turned on by enableBle" am: 81895505 -s ours am: 853cd3a7 -s ours am: cd21afa0 -s ours

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

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

Change-Id: Iccb7f1564aaa4df30e74ab619cd0e7db7b1e0359