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

* commit '5f8d48324e891fa9953ffa3056ea9d8f03075d96':
  Fix 5608959: Make keyguard follow user setting for orientation