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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0e1798962502a51241084c6d634b0c3ff5c9f9a