VmSecret/ErrorMessage: Add more context to errors am: f18ffc3215

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

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