am 872d264c: am d6162cf2: am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev

* commit '872d264c0a19ea0db078509edb17bd125ff5449d':
  Un-remove legacy ConnectivityManager API.