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

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

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