[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: e831e29cfc -s ours am: 0de4048d64 -s ours am: 382e7be97b -s ours am: fd1c1d7055 -s ours am: cc99f72f4a -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: Ic21d290e61c3a800ffc08b3eeef28c6a122f7326
This commit is contained in: