Merge "Add API for VPN apps to query always-on and lockdown."
am: 5e135e2bdc

Change-Id: Icb11cdd5c7384eacf1df9b7a0c42e451641f0e04
tree: dab18632e624a75ebf7287dbbf2ded4843ad4e60
  1. core/
  2. services/
  3. tests/