Merge "Rework unvalidated prompt into first eval timeout" am: ecb0b3cab3

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

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