Merge "Avoid Bluetooth gets turned on by enableBle" into sc-qpr1-dev am: 2195d4448f am: d3c04e2bb9 am: 5d43e09d1b

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

Change-Id: I8f56a12c0ade404374d34de8bda0306a2d05274e