Merge "Fix py3 error in aosp checker" am: 2a81f7cc18

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1679713

Change-Id: I8618e28b6ab220d9f10beaf5374cc8113bb90148