Merge "Add support for decoding proguard map to report_sample.py" am: 082b8c9785

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

Change-Id: I6835ab3a6978b02c6099fcb4392ba567dcb8b2c1