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

Change-Id: I51dd081ee48a4d89ad81499db12979cfc9f5b4c1