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

Change-Id: I71be1b8817bbd6d263745399ac62321b1e9e3722