Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed
am: 345673cc89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000 Change-Id: Ib9d8288b33d120fb88e7656f9aa0d725021ebfd4
This commit is contained in: