Merge "Fix bugs with verify_trace." into main am: 64eb04f852 am: cfa682ae0b

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3371702

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