[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: f589c5825a -s ours am: 53060241be -s ours am: 61a2f7450e -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: I09a614405b37e1c1dac9d9061cf346addf4d296d
This commit is contained in: