[automerger skipped] Merge "Fix documentation of CallRedirectionService" am: 820a7b5144 am: 3c9e9d1939 -s ours
am: 2881e89cee -s ours
am skip reason: change_id I48f60b3c4a465e22250aa513a4d7d73f82375426 with SHA1 87833ee867 is in history

Change-Id: I137c9203ef9c40b947a73bb6696290419d167dff