Merge "Simplify map_or_log_err" into main am: d49e9ba243

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

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