Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: 6428d536c6 am: 342e16a4c1 am: ad513bf05f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025 Change-Id: I6eb0d483460ece9d431d8d15caf896254a298121 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: