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

Change-Id: Ie7f208bea3c86be02a90abc73a96b5ec7f28bb37