Address ConnectivityManager API comments. Bug: 36370941 Test: marlin builds and boots Change-Id: I693ee5270bf186c88c7c5056293519f7237504ff