[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: f14d3ca0d8
-s ours am: 8257674c53
-s ours am: 156f041f7c
-s ours am: f4486b6d39
-s ours am: dc46129f1d
-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: Ib94d2bf7ca4fb8f35be5b9a224d7417aeac4b114
This commit is contained in: