Merge "Drop some python2 support in simpleperf_utils.py" am: be271379f6 am: 95768ef624

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

Change-Id: Iad7fc6921080835b143bd8f4b3b9df054024fec9