Merge "Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: f8969b233c" into nyc-mr1-dev-plus-aosp
am: 24f6de59e5

* commit '24f6de59e5f7913665baa31a157d54fbe88cdf81':

Change-Id: I83a5f2e1b7cb084fb85b273aa8790106af130ea2