Merge "Change APIs related to carrier actions." am: b430d57705 am: 0ef137bb81

Change-Id: I5b21f2461a85f1832c4b73f3f6cf7d8946e7fdb6