[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: a21784b0 -s ours

am skip reason: Change-Id I219397e807ae84dbeb1566f795ab2754f466bec7 with SHA-1 bdf64b74 is in history

Change-Id: I84cf7f1de6a683f720da68f122975e218bf009af