[automerger skipped] Increase test coverage for VPN info sent to NetworkStatsService. am: f0932b894a am: 5a339b5231 -s ours

am skip reason: skip tag Change-Id I3711b362f31cb92b759e9f5c9d244fb88d9bd5e7 with SHA-1 4525be8bfd is already in history

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

Change-Id: Ib0939855e528d7c8268d290cd511deeb7c247192
tree: a5eb007f22875a587b8ffd1f8b9b7ac3a5f04725
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS