[automerger skipped] Merge "Allow all system configs in /product" am: eca4c3a0d6 am: 0601a2a886
am: c3f416b6cd  -s ours

Change-Id: Id3176b10f1c93a4d463822c961fb0d1ecab8533c