Merge "Add more logging for fatal errors" into main am: 6d4af63dc7

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3184640

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