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

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0ab -s ours am: 86e798c9 -s ours am: 001ff34d -s ours am: e1ebf171 -s ours am: 191be2c8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3a15803df77d9b42bef5ba4ac7f33d89531c9c27