Merge "Adds a PhoneStateMonitor to the AssistManager" into qt-dev
am: 5d9fede666

Change-Id: I34731c170afb7c09421959fe07c8e06909bdde16