Merge "[automerger skipped] Update auto-gen test config template with EXTRA_CONFIGS placeholder am: 8d5459fc6d -s ours am: 757a503749 -s ours
am: bf896d7eea -s ours
am skip reason: change_id I2fdae79d45fd1e5866ee94d1f0e59df106be2a87 with SHA1 4c55da09db is in history

Change-Id: Iba55a0b3c1a985ee0b1759c67a1ebd033d8d7d85