Merge "ConnectivityService: synchronize access on mLockdownEnabled"