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