Merge "Update javadoc of isApkVeritySupported" into main