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