Merge "Add PID to report_sample.py" am: 88ce7f8bfd am: d740106527 am: 62cc1886cd

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

Change-Id: I6fb8aa678cf201ce0d1c10a421b681979e359acf