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

Change-Id: Ic08a2d8ec49009f60efc13e8d7461b93b304f8a7