[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15
am: 9c5b980cbf
-s ours am: 52b37ccbdc
-s ours am: bf0755ee8b
-s ours am: 1a07e2481a
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002 Change-Id: I4ccd092346886bc7e2e06da8060a8e62791e3e94
This commit is contained in: