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

* commit 'f99b6f2886cde0406798f0b8b4b1666c29b387bf':
  Un-remove legacy ConnectivityManager API.