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

Change-Id: I4e5609af2b23b333908732a1a12cb6e97815edcc