[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1
am: f589c5825a
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002 Change-Id: I514509ec73f09d26603ad0946bf73a4f671c3aeb
This commit is contained in: