Merge "Address ConnectivityManager API comments."
am: b5d6e45e8d

Change-Id: I4a29a929e2482d664a969ca38e5f73c3ed816175