Merge "Map the failure on enabling fs-verity to the atom" am: 936ac75795 am: 8ab3570c84

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

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