Merge "Address ConnectivityManager API comments." into oc-dev am: ce8eae73af
am: 5c34fceb3e

Change-Id: I8f7ec6d4a2ee8c74e015fdff0ef83fe4218b4efd