am 54b98c71: am 99ef3aef: am b54ec1bd: am d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev

* commit '54b98c71355c000a54f0f978b13ce9fabf1e5ef9':
  Prepare some ConnectivityService logic for fallback to Cellular change