RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: a079b5013b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000

Change-Id: I7dc41a5926fff9d4b1ced77affbeb7c67d79afa6