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

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

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