Merge "Add debugging info for transactions" into main am: 95b8309b2f am: 09005dc0fe

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

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