Merge "ConnectivityService: safer locking"
am: b8dc7fbc6d

Change-Id: I88a118bb59f8a870d42d2d665f838f5236ebd21c