Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16144999

Change-Id: I6a0e93088a5aaab9473fb1e10458f69d63ded20c