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

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 50063676 -s ours am: 0e8d3e3c -s ours am: 7134e1ac -s ours am: 62e55593 -s ours am: 9c1eb61f -s ours am: f87658eb -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: If240da482776a5f75693a6e27e068563fbb54344