am a6399288: Merge "Remove different layout for landscape in Keyguard" into lmp-dev

* commit 'a63992888988017f664cc4c33ea1f0d546959b9d':
  Remove different layout for landscape in Keyguard