Merge "Revert "soong_config: Add flag for devices use metadata as FDE key"" into q10