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

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

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