[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I40232a1c9484299932210e03068257f38250bb9d