Merge "ConnectivityService: safer locking" am: b8dc7fbc6d
am: b960ee662c

Change-Id: If4985a8d51c03ea6cc3be121962bbf27f980fdc7