Merge "Don't run AttentionDetector when wakelock is held" into qt-dev am: ed8620ae02
am: b326363d94

Change-Id: Iffe2e9673b3de295412bb882d893f84fca524040