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

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

Change-Id: Iad2a2fe7384a661e6263d238301fc7a1665049c3