[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 -s ours am: 84935cea -s ours

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

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



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