[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: 421e0c39 -s ours am: b84efe71 -s ours am: 6915e70c -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: I3db72d3caec60500f332c41633fe35991b7310fa