[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284
am: d1ee2f41e8
-s ours am: 42d4ef99a5
-s ours am: 53c90efd25
-s ours am: 835a9f0718
-s ours am: 24c1a557fc
-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: Ib762995f60f467c505f2b2360936b697f1ae7c93
This commit is contained in: