Merge "Revert "improve mism support for phonestatelistner""
am: 6eab01bf59

Change-Id: I4c54c362aedaf680fd59a10cf4d792910ba8a04c