Partial cherry pick of commitb58d8aa66afor resolving api changes in ConnectivityManager. Bug: 36370941 Test: marlin-eng builds Merged-In: Icb127e468698711669ecc2c2002ff8add56700e0 Change-Id: I12944690c81e910d39c84727454c76fd146c3f68 (cherry pick from commitb58d8aa66a)