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

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

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