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

Change-Id: Ic5dfac3c117937dd1ff96653463bc31a22a3c2fc