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

Change-Id: Iedac1e363872fc390df007d5b4e977c03e725bdf