[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003 Change-Id: I374713caa6f72a15632eff3b43727c7ce6204cad
This commit is contained in: