[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc
am: aaa1683558
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16144999 Change-Id: Ifbb29be9ad5b8a0d99438989ab757a51f090cd1e
This commit is contained in: