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

Change-Id: I7cb4d1e9e1fc3dc5ca116dcc94840920cd4a3d64