Merge "Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46 am: f8969b23" into nyc-mr1-dev-plus-aosp