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

Change-Id: Iaaf170a63f97d00275bd55fa6f499f757ae98961