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

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c48 am: c96d9867 -s ours am: c5447d70 -s ours am: f14d3ca0 -s ours am: 8257674c -s ours am: 6b8ae36f -s ours am: 1d4532c3 -s ours am: 059e6987 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I723b53661f5da27a3f4e1419c46a91cb33e5b676