Merge "Fix issue with python3 conversion of build_verity_metadata.py" am: c17997c5a3

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

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