Merge "Fix VcnConfig garbage collection" into main am: 7b4603df93 am: 5ef712349c

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

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