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

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

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