Merge "Remove py2 usages" am: 913bc40fd3 am: 18fc7edc34 am: 8fd876d961 am: 910590fca5

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

Change-Id: I1d946d4c60a7966b38418e31189e736cdacd38d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>