Merge "CallRedirectionService API review" am: 1276a178fd am: de633a49f1
am: b09f8d20e3

Change-Id: I184b51e7aa8816fd0e46d2492222cf617b13eba5