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

Change-Id: I95b6ea2a0b1f6cb43e84c27cd01909f9b5c016c3