Merge "Do not reuse phonestatelistener"
am: c99fddfe75

Change-Id: I52e311da7ae9a9477b74fc25f6bb122935e14582