Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d
am: 54b280ba66

* commit '54b280ba66d8f92d73711df4d02add1140eb416f':
  Rename carrier messaging API constant.

Change-Id: Ib94ec913651d3b0c92e43927cb8a091732319777