Merge "simpleperf: fix deobfuscating Java symbols." am: 73ecedc8ce am: 53a42257c7 am: 11dc12d3c7

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2408712

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