Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883

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

Change-Id: I3be5109c253365b3c5bc56ae48114f8e37c4f153