[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: aca50be7d8
-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: I92ffefc91c4266729511cc9396a9e5781a4d53df
This commit is contained in: