Merge "Update trace_processor_shell" into main am: aebaa859d8

Original change: https://android-review.googlesource.com/c/platform/prebuilts/tools/+/3242776

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