Merge "Show date + alarm icon when on lock screen" into oc-dev am: 0c78e8238d
am: b49e1cec29

Change-Id: I312c058887f23c475dbcc8eeaf87b762666df9dc