[automerger skipped] Merge "Fix issue where post-dial digits are not re-added...
[automerger skipped] Merge "Fix issue where post-dial digits are not re-added to redirected numbers" am: ed2e3dd6 am: bcdf1b46 -s ours
am skip reason: Change-Id I219397e807ae84dbeb1566f795ab2754f466bec7 with SHA-1 bdf64b74 is in history
Change-Id: I1ce8546de1c559023fa0a5c379a063adc73b2af9