Merge "Fix tests for wait for internet flags." into main am: 6beeee510c am: a452e28799

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3283974

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