[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952
am: bfc96e1036
-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: Ia393a8dd16e24f6bf0b754ee0535f3b9b31a7b77
This commit is contained in: