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

[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4 am: f589c582 -s ours am: 53060241 -s ours am: dca1c2ba -s ours am: f55e0333 -s ours am: 5881ef1d -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: I1b5cb0adabe2d156f1f13ef7bdb39683dd763b87