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

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

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