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

[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087 am: 3d6b2b68 am: 981673f9 -s ours am: 1112a774 -s ours am: 86956394 -s ours

am skip reason: contains skip directive

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



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