Merge values from legacy config into variants too.

Bug: 293289578
Test: atest cargo_embargo.test
Change-Id: I69f22aeac8d045b502101fcd186994d181ba1362
1 file changed