Pie: ERROR

PS7: NPEs AIN'T GOT NOTHING ON ME!

Change-Id: Iec485bf0fa030590f5f2eb176413dd82eb0acd38

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/display_settings.xml
	res/xml/user_interface_settings.xml
	src/com/android/settings/vanir/fragments/UserInterface.java