Merge "Merge "improve mism support for phonestatelistner" into qt-dev am: 62751b8014" into qt-dev-plus-aosp
am: fd1359d926

Change-Id: I9dae41bb301e2ad2e717f20a7f7403c300575d5f