am: f8969b23 * commit 'f8969b23': Rename carrier messaging API constant. Change-Id: I770c85c4036de650f78bb0bdb57ea610049e9511