[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: 4a3bbeee -s ours am: c06aef8e -s ours am: 2d742d01 -s ours am: 7fccf00f -s ours am: 72366e30 -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: I43c0db0ee2b4c9af892691db836c69ca5c7a1f2a