Merge "Merge "Don't run AttentionDetector when wakelock is held" into qt-dev...
Merge "Merge "Don't run AttentionDetector when wakelock is held" into qt-dev am: ed8620ae am: 7ba03c7f" into qt-r1-dev-plus-aosp
am: 2ec07bc0
Change-Id: I5e67cd0e7182f02a1b2e75b36a0d1b3ea1a66fd6