[automerger skipped] Merge "Avoid Bluetooth gets turned on by enableBle" am: 99f31b981d -s ours am: 4c40734d1a -s ours am: 77374e5afe -s ours am: 749746b154 -s ours am: cdea366f3c -s ours
am skip reason: Merged-In Ic9df612ec0e396932df2fb3bf3a5874bd4e7443c with SHA-1 cc89e936cf is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1821214
Change-Id: Ib59d9b58266bb232a4d5a9fe8f9aac38cc95c179
This commit is contained in: