Merge "Merge "Run ApkVerityTest if first api level >= 30" into rvc-dev am:...
Merge "Merge "Run ApkVerityTest if first api level >= 30" into rvc-dev am: 0af18474 am: d3c37d3e" into rvc-d1-dev-plus-aosp am: 4142f76a
Change-Id: I11595a4852fb73cac54918a780115a7481aeeed5