Merge "Don't send spurious onAvailable NetworkCallbacks when rematching" into mnc-dev