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

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



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