[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: 9ea7a626 -s ours am: 62a6ca50 -s ours am: ff194d44 -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: Id8739ed51574a18de156e1efbe2f5d22ab438215