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