Merge "Avoid Bluetooth gets turned on by enableBle" into sc-qpr1-dev am: 2195d444 am: 8e34373b

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

Change-Id: Icd35e25d759a7664e03e1483db7d22c9a612bc4d