Merge "Update VcnManagementService javadoc based on new names of classes" am: 7a7308b53d am: dc69815d73

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd14d665746e460c9422c0489173ca9185636158