new pie options

Change-Id: I9a097c382843c8610f5a9ed2c5b14276393b1269

Conflicts:

	res/values/strings.xml
	res/xml/pie_settings.xml
	src/com/android/settings/paranoid/Pie.java