[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: 569b8552 -s ours am: e2f30e1d -s ours am: 9a82e9c0 -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: Ib972b849228d7aca49945d65fd2fd4f2ae9651ed