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

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

Change-Id: I30dfbdefbc1447622cb3b83868795dee0eed1de0
Signed-off-by: Automerger Merge Worker <[email protected]>