[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1
am: f589c5825a
-s ours am: 53060241be
-s ours am: dca1c2ba08
-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: I20675a89d6f2379d32f4d95dcec8d285cc278a9a
This commit is contained in: