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

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a am: 9c5b980c -s ours am: 52b37ccb -s ours am: bf0755ee -s ours am: 1a07e248 -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: I4ccd092346886bc7e2e06da8060a8e62791e3e94