[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc
-s ours am: 598db440f5
-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: I8a68e9eaf07bc822abae5609a0b5c3f995126c52
This commit is contained in: