[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: c1c7d536a2
-s ours am: eeef648740
-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: Idb16debb4cb64335dac944f358df714969871fd9
This commit is contained in: