[automerger skipped] Merge "Use Call Redirection service in Telecom" am: cd41ef6d am: c006d206
am: ab2b0ce1 -s ours
am skip reason: change_id I91733371d5d40ee923a44f6165f7f6ddc5cd0cca with SHA1 904092d4 is in history
Change-Id: I8c4eacc055c9a5efb81c112909f700cf15014723