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

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

Change-Id: Ia87bc9e41bb5aff35ade92879ad1370d3c8ed75b