am 3d8bc316: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/policies/base into eclair-mr2-plus-aosp

Merge commit '3d8bc316ae81b443522c812a896d42fb2978ba3d'

* commit '3d8bc316ae81b443522c812a896d42fb2978ba3d':
  Ignore requests to hide the keyguard if we are in the process of waking up.