Merge "FrameTraceTest: Account for extra perfetto trace packet" into main am: aea65bc9da

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2717253

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