[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b -s ours am: 4a3bbeee -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: I4fc8d0c172bf1c708296ed418e7e1364455bce1a