[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821
am: c96d9867c5
-s ours am: c5447d70d3
-s ours am: 1bb96ff4ce
-s ours am: 152ba179f4
-s ours am: 551e444c47
-s ours am: e535c2b67c
-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: I15ec2417f4bc7148ff9e2fa51e82bc2e4d544203
This commit is contained in: