[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 skip reason: subject contains skip directive

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

Change-Id: I7a71b020fc7344f8d80f2671a1ef41e642fb1374