Merge "Don't show UDFPS when statusBarState != KEYGUARD" into udc-dev