[SQUASHED] Lockscreen Notifications (2/2)

Change-Id: Ib13c39cb67839bec92a660000eae23bdb7fdfa30