Merge "Address ConnectivityManager API comments." am: b5d6e45e8d
am: b57db6ef97

Change-Id: If38be1435c55c66890bb5c702a7b9b23240c0b64