Merge "Prompt user to add data on mobile portals" into main am: 5db2089717

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632310

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