[automerger skipped] Show dialog on Wifi, and APM' entries in Settings am: c0b39601 -s ours

am skip reason: Merged-In I45cd92a8688e7a619613361ea4a8d58a0984d99f with SHA-1 29b2f16e is already in history

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



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