AXI0M DIRTY::Make pie being dependent on expanded desktop optional (2/2)

ps3: Fix system setting name
ps6: tweak default state

Change-Id: Ifd8d96dbcd61fdfa5528f37944cb7fd8f47700c8

Conflicts:
	res/values/strings.xml
	src/com/android/settings/carbon/Pie.java