Merge "Update trace processor to include aosp/2786261 and aosp/2786265" into main