Merge "Convert ICarrierService to oneway."
am: a9494954d9  -s ours

Change-Id: Ie385d36ff924adb152c36982ca11d741af44b48f