[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: c1c7d536a2 -s ours am: eeef648740 -s ours am: 8da12696bc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003 Change-Id: If1ec1e4537af893f843b105c92bdd15168bf35fb
This commit is contained in: