[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: 56b95bd8c0 -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: I0bc5589c9157ee6fa8eb56c8daf310c0c7d89ba8