Merge "Remove py2 usages" am: 913bc40fd3 am: 18fc7edc34

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

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