Merge 538c429a ("Merge tag 'trace-v6.16-3' of...

Merge 538c429a ("Merge tag 'trace-v6.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace") into android-mainline am: 43636f28

Original change: https://android-review.googlesource.com/c/kernel/common/+/3685157



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