Merge "[automerger skipped] Modify javadoc for some extra values of VpnManager...

Merge "[automerger skipped] Modify javadoc for some extra values of VpnManager event am: bf3953a6 am: 0b248c90 -s ours" into tm-d1-dev-plus-aosp am: f3148932 -s ours

am skip reason: Merged-In I7fd4b6dad1a4363336f03c217e635fc45bcd0ab6 with SHA-1 bf3953a6 is already in history

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



Change-Id: I9dc5dcb02bb626de5d258c14c1505f9f4864ac76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>