[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284
am: d1ee2f41e8
-s ours am: 42d4ef99a5
-s ours am: c403c2bd93
-s ours am: b7c8a85e8d
-s ours am: 3d50e716e2
-s ours am: 99b4f6964a
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003 Change-Id: Ic07a613e73d7b6ec3142f4a9cde2ba53e12409d0
This commit is contained in: