[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: 7a5b3bcd -s ours am: d5142b1c -s ours am: df111807 -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: I97050709acbdb561b63354fc9f44e9d51455e6d2