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

Change-Id: I8aab0dd1556b49cafc08d57a8981051ba437fe44