[automerger skipped] Merge "Add annotation for Vpn#getNetwork()" am:...

[automerger skipped] Merge "Add annotation for Vpn#getNetwork()" am: 8db8d890 am: d734d347 am: a1489017 -s ours am: 1f8cf93a -s ours

am skip reason: skip tag Change-Id Ic52864003fbebd9f4e95d43fefc2e168437b0122 with SHA-1 1ef9b4d4 is already in history

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

Change-Id: Iaf5fe8c3176cf82e8221a83753d9aa8c57834794