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

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

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