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

[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4 am: 56b95bd8 -s ours am: 09258363 -s ours am: 7a5b3bcd -s ours am: dee7e162 -s ours am: 42df29c7 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I50a269e44b544cc126ca4411c318a74cd5197eed