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