Merge "No-op refactoring of VPN lockdown status check." am: 5c67de8417 am: f03247ac4e
am: 4c2b34797e

Change-Id: I3fb09861c6e6d4c6db2a4105b464018d0b1d8224