Merge "Simplify map_or_log_err" into main am: d49e9ba243 am: b51d4fdb5e

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

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