Merge "Change the definition of noDefaultNetwork and noValidatedNetwork" into sc-dev am: 144d78e7 am: 45cd0403 am: 53ee0432

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

Change-Id: Ifff68f50fab34b4c80216293426df4c309b5c20b