am 4c8454d8: am e851cdc6: Merge change Ifd95b9f5 into eclair

Merge commit '4c8454d8699cbedf473565bb92a80defaf95af09' into eclair-mr2-plus-aosp

* commit '4c8454d8699cbedf473565bb92a80defaf95af09':
  Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.