Merge "Avoid Bluetooth gets turned on by enableBle" into stage-aosp-master am: d9d1dd7c53 am: c993f1b2c1 am: dbd5cf8828 am: ed4aa69904

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

Change-Id: Ia3a52944455996fe66706bed50d66eb38520acdf