[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable...

[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed22 am: d1ee2f41 -s ours am: 42d4ef99 -s ours am: 53c90efd -s ours am: 835a9f07 -s ours am: c1c7d536 -s ours am: eeef6487 -s ours am: 8da12696 -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