Fix for pending calls not being reused

The if check to potentially reuse a call based on its original number
would fail if the second number had been rewritten or formatted
differently.

Compare normalized versions of the two addresses to determine
equality instead.

Also increase the timeout slightly for reusing a
pending disconnect call.

Bug: 20820155

Change-Id: Ifc3ae0a1a1b66132a500665cd7f8bca75a4981b3