Merge "Fix more issues with python3 conversion of build_verity_metadata.py" am: 4e69dcd3fa

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

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