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

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

Change-Id: I734d449afaed4a862d189b15dc7341026f81d8ba