Merge "Add screen state, dozeTimeTick to keyguard repository" into udc-qpr-dev