[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: 9c1eb61f8e -s ours am: f87658eb94 -s ours am: bab272fdc5 -s ours am: c62ef5c8ad -s ours am: 485a646cbd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004 Change-Id: I57b6a14b6584fb3d4317103fdab5c55ed827a2ca
This commit is contained in: