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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3571722156aaaa6c04b812e58dd011f37029cdb
tree: 2175536c32693adb9e53db13547e03eb73727920
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS