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

[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed22 am: d1ee2f41 -s ours am: 42d4ef99 -s ours am: c403c2bd -s ours am: b7c8a85e -s ours am: 6f423d2e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id683d7caea00a4e298884976c567f5e4c9de8ccf