Merge "Don't check attention when in lockscreen" into qt-r1-dev
am: fce768e553

Change-Id: I60606f6b838f6e49b3c2385c85b3dd80e4394f33