Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev am: 42dfcc772b
am: c21a98dee0

Change-Id: Ia21d10601651123326fba5944e39f52e42c7c746