[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003 Change-Id: I408f048b1b17bea93f17cc33881c93d84acfd1ce
This commit is contained in: