Merge "CallRedirectionService API review"
am: 1276a178fd

Change-Id: I4509bfabae430b97ee82c2939b9099dc5767f44a