Add support for carrier demo mode

Fixes: 33746309
Test: manually verified carrier demo mode and normal demo mode are setup
correctly

Change-Id: Ia38790599f672a9d1999274276156b5328c9f75a
(cherry picked from commit b632c5546968bc20e60e5b86ded4c41612a47c52)
4 files changed