Merge "Revert "b/10699042 show dialpad when connects to voice mail."" into klp-dev