Merge "Minor fixes to LockdownVpnTracker." am: 74cbf1917b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib400714e6faa8cf06487c5d6c721fdd444164fa4