Merge "MM to set export_tombstones if enabled via config" am: 7d6c066401 am: 98fd699365

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

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