[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952
am: a079b5013b
am: 8c44db0adf
-s ours am: ec4700228b
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000 Change-Id: I104851834776c096d0d6faee5ad51f69052030bc
This commit is contained in: