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