[automerger skipped] Merge "SystemConfig: Allow runtime differentiation of vendor configurations" into rvc-dev am: 02e00a379b -s ours am: 212936f438 -s ours
am skip reason: Change-Id Ic1a332d30224f6d26afdfc230ea7c1462aefa243 with SHA-1 50c61752a8 is in history

Change-Id: I24cbdea182b2219d2d55b6ea1813c17ce7faec9e