Merge "SystemConfig: Allow runtime differentiation of vendor configurations" into rvc-dev am: 02e00a379b am: e0ec3cbcb1

Change-Id: I903ac0d9d77f77ab34dc9b846c8d684917d8b510