Merge "Revert "Do not reuse phonestatelistener"" into qt-dev-plus-aosp