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

* commit '691b81042f0d443dc16d82426c043d4a3f76378a':
  Un-remove legacy ConnectivityManager API.