Merge "ConnectivityService: synchronize access on mLockdownEnabled" am: 46e9e35835
am: 2d59e3cab0

Change-Id: Icadee616fc95e1c126285524dfe49331fcf87462