am 8e21d29f: Merge "Don\'t send spurious onAvailable NetworkCallbacks when rematching" into mnc-dev

* commit '8e21d29f7e8691c5798ef613c2ccc4112c649421':
  Don't send spurious onAvailable NetworkCallbacks when rematching