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