Phone//Phablet UIs: Bring back two-line layout for status bar date.

Change-Id: I4bf7ce61b22da89b3b8c1a3f00e077461061f7b9

Conflicts:

	packages/SystemUI/res/layout/status_bar_expanded_header.xml