aml_cfg_341510000 (11285611,com.google.android.configinfrastructure)
Snap for 10453563 from 11ea8d4853d264e6ae508570870301da66173cb7 to mainline-configinfrastructure-release

Change-Id: If85bae3fe862972952c8c4c6ac28b3bdc1bc814f