Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev am: 0781c52dfe am: d9776becdb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016144

Change-Id: I4c3a84b25706cac2ec726897d92be2b2af4c50dc