Merge "Fix py3 error in aosp checker" am: 2a81f7cc18 am: 099613d389 am: af67d93d37 am: 46f87eac2c

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

Change-Id: I29a59f6a16d8e12a38d815bbc74ed5cd299e6c9b