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

Change-Id: Ia53ea3f63449798e95930c08a1ca0d618ccbfe91