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

Change-Id: I8aab0dd1556b49cafc08d57a8981051ba437fe44
tree: 20a8b8420e6bf23d6c7579a759ce5ff6d4463012
  1. core/
  2. services/
  3. tests/