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

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

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