[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict...

[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDialogActivity am: aabb15de am: a71eb50f am: 2a9ea31f -s ours am: a10cad44 -s ours am: fe96539f -s ours

am skip reason: contains skip directive

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



Change-Id: I5ecac8ff46ac26963a6ce21a136adbbb55926424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>