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

Change-Id: I5e01449dc14a6d38c0e02adfc9cbc886be4e080f