[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 58d81fbbb4
am: be094163b8
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130956 Change-Id: Iae40581f7c0cb0e2e89fbc85cec5c81b52370d93
This commit is contained in: