Merge "dumpstate: Fix missing Java anr traces in bugreport" into main am: 86e25122da am: 32bc0fa59b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2907818

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