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

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