[automerger skipped] Merge "SystemConfig: Allow runtime differentiation of vendor configurations" into rvc-dev am: 02e00a37 am: e0ec3cbc -s ours am: 304343ab -s ours am: ee1e54f5 -s ours
am skip reason: Change-Id Ic1a332d30224f6d26afdfc230ea7c1462aefa243 with SHA-1 62e21252 is in history

Change-Id: Ifae1c660c0e6c37bba63ce970c731a15cd97baa8