Merge "Recheck if the network state in expedited job is unexpected." into sc-dev am: 1ec983c471

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

Change-Id: I02fb4442949afbe1b6ba4330f4986f7369f97851