Merge "Fix flaky testNotifyNoInternetAsDialogWhenHighPriority" am: 28a690dc79

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

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