[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable...

[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4 am: 56b95bd8 -s ours am: 09258363 -s ours am: 8726322c -s ours am: adacd972 -s ours am: cc4915aa -s ours

am skip reason: subject contains skip directive

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

Change-Id: I15d8eead93a82974008aef82115bab19e6ba043e