Merge "Revision of CallRedirectionService API Review" am: 9dc1900ea9
am: ba810d3a8b

Change-Id: Iff91b23e3ad92cb733f334793152c531becd1da9