[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed
am: d3647e4668
am: f878351899
-s ours am: 81e6192261
-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: I1e6f3f84a1d207401aa4bb08f0bef9f9e14cebbb
This commit is contained in: