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

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

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