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

Change-Id: I28b9770a60a5ddbcc44449401e078c2dc651a0e2