[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1
am: 56b95bd8c0
-s ours am: 09258363f5
-s ours am: 43b8699418
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002 Change-Id: Ifc004f48c18722a4a93b7827fce0aa49277937c9
This commit is contained in: