Merge "Add security_patch avb property for android_filesystem" into main

		addStr("avb_algorithm", algorithm)

		key := android.PathForModuleSrc(ctx, proptools.String(f.properties.Avb_private_key))

		addPath("avb_key_path", key)

		partitionName := proptools.StringDefault(f.properties.Partition_name, f.Name())

		addStr("partition_name", partitionName)

		avb_add_hashtree_footer_args := "--do_not_generate_fec"

		if hashAlgorithm := proptools.String(f.properties.Avb_hash_algorithm); hashAlgorithm != "" {

			avb_add_hashtree_footer_args += " --hash_algorithm " + hashAlgorithm

		}

		securityPatchKey := "com.android.build." + partitionName + ".security_patch"

		securityPatchValue := ctx.Config().PlatformSecurityPatch()

		avb_add_hashtree_footer_args += " --prop " + securityPatchKey + ":" + securityPatchValue

		addStr("avb_add_hashtree_footer_args", avb_add_hashtree_footer_args)

		partitionName := proptools.StringDefault(f.properties.Partition_name, f.Name())

		addStr("partition_name", partitionName)

		addStr("avb_salt", f.salt())

	}