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