Lockscreen : Use correct filter for background

Switch over to SRC_ATOP filter instead of using MULTIPLY.

Change-Id: I6b8dac563136cd10b48b6fc6c0ecb2265d0e0b04
NotificationManagerService: fix typo on led off time variable

Change-Id: Iade96474c26dbeb3a5a671170f563220562d9b3c
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_frameworks_base into cm-10.1