Merge "More diagnostics for slow operations" into main am: 031ff9e635 am: 52c614cec5

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

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