Merge "prebuilts: update trace_processor_shell" am: 4f1b5aebbb am: b25e3f61fc

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

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