Merge "Synchronize VM callbacks" am: 1a54a7d0b5 am: d4fc580c32

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

Change-Id: I1646700feb5388b0b6fb4fcdc38ca921839a94c9