[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: f55e03337e
-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: Ifb01162b831608674a130ecd9c90aa576040fa36
This commit is contained in: