Merge "AVF to shift to default instance of Secretkeeper" into main am: 38008d0026

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2973453

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