[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-v2-dev am: 8072964193
am: d2ed4d204f
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130956 Change-Id: I30d17aa57a09dc08eefc2606e25ab282e4160d5a
This commit is contained in: