Add support for carrier demo mode am: b632c55469
am: b4be8c8df1  -s ours

Change-Id: Ief253b88502ec5bd2092e4d20956a3098202cec6