[SQUASHED] Lockscreen Notifications

Change-Id: I29d7b7f5bb8157b1460ecf51a4deef1edec7660b
Merge "[SQUASHED] Lockscreen Notifications" into android-4.4