[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742eb -s ours am: d5ff6888 -s ours am: b8854520 -s ours am: 71c18be8 -s ours

am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf5 is already in history. Merged-In was found from reverted change.

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

Change-Id: I536d938b9a1c579822b546b79869c38bad161cc7