Merge "Convert ICarrierService to oneway." into oc-mr1-dev am: 806af68f5d
am: c323c9f4e9

Change-Id: Iaab75e584578be138d9e629bec59e32691771b67