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

Change-Id: I8960a2db90b86159d7114b736bc29f0b4f9fbafe