am 4f63f54f: am 5584737f: Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev

* commit '4f63f54fdea298358fe9c05a5f4cc975769a69af':
  FLAG_DISMISS_KEYGUARD should not hide status bar if secure.