[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: c403c2bd -s ours am: b7c8a85e -s ours am: 3d50e716 -s ours am: 99b4f696 -s ours am: 3aaa818d -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: Icb44245d1b8feab607afa8223ba1891da00e3340