Merge "Minor fixes to LockdownVpnTracker." am: 63072f5113

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib400714e6faa8cf06487c5d6c721fdd444164fa4
tree: 43865b8cdf234d841e5b4575b2c566f1247c027a
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS