[automerger skipped] Merge "sf: only look for graphics frame packets when asserting on traces" into rvc-dev-plus-aosp am: 1feaa2a1d1 am: 2d54839781 am: 83111a9f1b -s ours

am skip reason: Change-Id I0c323761acd35ca4d3b9e21c2a68d1baefdcd13a with SHA-1 3bde6ae057 is in history

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

Change-Id: I1836e6c0e95b2200e5020c3c073b225cedfae707