Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev