Merge "FUL being unsuppressed when screen turns off fixes b/7453702" into jb-mr1-lockscreen-dev