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

Change-Id: If83fae5f70cb2e253a4107591f43d9ce2d648006