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

Change-Id: I0e6767143f3f7c0bedc90a15400055a062c3c90f