Merge "dumpstate: Fix missing Java anr traces in bugreport" into main