[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed
am: d3647e4668
-s ours am: 408ffe7fe9
-s ours am: e6b8e84bcd
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000 Change-Id: I7d6081094f5933e9826f953baf912df7c3b86a9a
This commit is contained in: