[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002 Change-Id: I33afadf2694e7eee1ceebc8354a7dfebda6e4d99
This commit is contained in: