[automerger skipped] Increase test coverage for VPN info sent to NetworkStatsService. am: d1029958 am: f4c6750c -s ours

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

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

Change-Id: Ib0939855e528d7c8268d290cd511deeb7c247192