[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: f91da36d -s ours am: 2f349df5 -s ours am: 545e8678 -s ours am: fdb2e9f1 -s ours am: 3476b186 -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: I49dbfac7d9ba438332dccf6f210112ca414e0ac1