Merge "AOD: Show date on always-on display" into oc-dr1-dev
am: 3fbe9d737a

Change-Id: I5fafed2ee739358c206e53adc08dcf25a6675560