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