Merge "Fix flaky testNotifyNoInternetAsDialogWhenHighPriority"