Merge "Move VCN utilities from services.jar to framework.jar" into main am: 6cf18f06f2

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

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