[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6
-s ours am: 86e798c998
-s ours am: d37cb4ae1a
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145001 Change-Id: Ib543df370d6c654e005ccb429961ac909669eeb7
This commit is contained in: