Merge "Consolidate isApkVeritySupported to VerityUtils" into sc-dev