[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952
am: 4d356edd17
-s ours am: 152b25d7da
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000 Change-Id: I4998b8f222ee551e634d94d581d6c82e9b8d9616
This commit is contained in: