am 8d6ff012: Merge "Fix 5608959: Make keyguard follow user setting for orientation" into jb-dev

* commit '8d6ff012ed14fb2e0ddad059deea3b1fe74aac3c':
  Fix 5608959: Make keyguard follow user setting for orientation