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