Merge "Shift to idiomatic use of `map_err`" into main am: a730f5b7f3 am: e975a41eed

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

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