Commit 4c40734d authored Sep 10, 2021 by Treehugger Robot Committed by Automerger Merge Worker Sep 10, 2021

[automerger skipped] Merge "Avoid Bluetooth gets turned on by enableBle" am: 99f31b98 -s ours

am skip reason: Merged-In Ic9df612ec0e396932df2fb3bf3a5874bd4e7443c with SHA-1 cc89e936 is already in history

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

Change-Id: Id63ecfa681b29806b745b853952f7a3f1a0bdd39

There are no changes