[automerger skipped] Merge "Revision of CallRedirectionService API Review" am: 9dc1900ea9 am: ba810d3a8b
am: f2d05ccd20  -s ours

Change-Id: I1bb7beed1ade19fde5deba914ef6746bc4dc1039