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

Change-Id: I22abc65b507ee22500977b15d7f4c54a73447836