[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: 001ff34dec
-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: Iec190ca6a928cf38b885b5a88f739a3c5f87ca97
This commit is contained in: