Merge "Add GlowPadView extensions needed for lockscreen targets and nav ring." into cm-11.0
Merge "Add back navigation ring customization." into cm-11.0
Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/symbols.xml

Change-Id: I13ff02189942b19c6889f0cd312e5249ab38181a
Fix navring targets build

Change-Id: Ide26652d7e6e2fb7c775cacd90ac1cb6bd8aa9b9