[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed
am: d3647e4668
-s ours am: 408ffe7fe9
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000 Change-Id: I7dfc4b4c72c6cb0039f8a7e47f4cfd4343c1a86c
This commit is contained in: