Merge "Reimplement ApkVerityTest" into main