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

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