Merge "Add GlowPadView extensions needed for lockscreen targets and nav ring." into cm-11.0
(cherry picked from commit 67e1fc53605108d437879c628c37e7764cb0868c)
Merge "Bring back two-line layout for status bar date." into cm-11.0
(cherry picked from commit f37a49dd96ff1f5374becc48ae886630d75476d8)
Merge "Add back navigation ring customization." into cm-11.0

(cherry picked from commit 2f106cd01c5c65a89fe8133e793fd4343dbc4685)

Conflicts:
	core/res/res/values/symbols.xml