Merge "Don't register for UDFPS long press in STATE_DOZE" into tm-qpr-dev