Merge "FrameTraceTest: Account for extra perfetto trace packet" into main am: aea65bc9da am: 3f63c37216 am: 527556682c

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

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