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

* commit '99ef3aefdb7c6208aaba8e9cef18c1b2f2aeba76':
  Prepare some ConnectivityService logic for fallback to Cellular change