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

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

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