[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15
am: e831e29cfc
-s ours am: 0de4048d64
-s ours am: 276b278225
-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: Ia1b2a7e5bb03482951f5ba454df24bf4b3025136
This commit is contained in: