Merge "Make WifiDppEnrolleeActivity launches explicit" into sc-v2-dev am: b94ae9ffb3

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

Change-Id: I85beb9352125aaa74df850853b81a1f9f82b24d0