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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cfdfe54af4ff25e6ca8aee8ddccc74882a72f71