[automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into...

[automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88ea am: 7f326976 -s ours am: e671474e -s ours

am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c37245 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400



Change-Id: Iad8f7328b28626ce01095e4fe6a4f0ce8274a265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>