Merge "Migrate VCN UT to New Android Ownership Model" into main am: 9f4ec92e13 am: dc735dc09d

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

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