Merge "Address ConnectivityManager API comments." am: b5d6e45e8d am: b57db6ef97 am: 08ab9ea526
am: 275c1ac91c

Change-Id: I4ba08fdfca51cbc11866e941dab76f2926f796b1