Merge "Prevent VCN service from being registered twice" into main am: f73ff252

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



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