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