Merge "Remove py2 usages" am: a773d405 am: a0ef72ec am: cf6787a0 am:...

Merge "Remove py2 usages" am: a773d405 am: a0ef72ec am: cf6787a0 am: 9ac03302 am: 785a57c2

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2214944



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