am add86719: am 14bee131: Fix lock screen layouts with emergency call buttons.

Merge commit 'add867197c0ae81b8120d70e4ae936df4a9c29bb' into eclair-mr2-plus-aosp

* commit 'add867197c0ae81b8120d70e4ae936df4a9c29bb':
  Fix lock screen layouts with emergency call buttons.