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

Change-Id: I7024b4fe23ab12760fb452a59929df886912b104