Merge "Merge "Adds a PhoneStateMonitor to the AssistManager" into qt-dev am: 5d9fede6 am: b3e31d12" into qt-r1-dev-plus-aosp