[automerger skipped] Merge changes from topic "add_permission_wifidialog" into...

[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b -s ours am: 876d9ec0 -s ours am: 88b0676d -s ours am: 869e01ee -s ours am: ef72e3b1 -s ours

am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d68 is already in history

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

Change-Id: Icf3a7c8ef5a4031233f727ea69d8c3684eff4ac4