Merge "SystemConfig: Allow runtime differentiation of vendor configurations" into rvc-dev am: 02e00a37 am: e0ec3cbc Change-Id: I903ac0d9d77f77ab34dc9b846c8d684917d8b510