Allow shell to set merged flag on Non enterprise config

Bug: 188233722
Test: build
Change-Id: If6d440d8f88fef6d1c0f9958210fc74591de5069
1 file changed