Merge "VCN: Remove hidden APIs for build type and vcn service string" into...

Merge "VCN: Remove hidden APIs for build type and vcn service string" into main am: 1c8ab2cf am: c8b0aa5a

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



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