[automerger skipped] Merge "SystemConfig: Allow runtime differentiation of vendor configurations" into rvc-dev am: 02e00a37 -s ours am: 212936f4 -s ours am: 2719bb71 -s ours am: 1bfe05f3 -s ours
am skip reason: Change-Id Ic1a332d30224f6d26afdfc230ea7c1462aefa243 with SHA-1 50c61752 is in history

Change-Id: Ic345ffe0fff4b22600eaefc51a53d6f9e19b3732