Merge "Fix for NonSimulatorConnection listener causing dialer crashing after ending a call." am: 46cdf805e0
am: 0ed650e203

Change-Id: I5297bee63cbb7647c57e86eb6d724dca31b6059e