Settings: Add missing up navigation in menus

Squashed forward port from cm-10.2

Change-Id: Ia9d51b53df8a3eb4c1b9dee1aeefb0b74eac0fde
(cherry picked from commit 75fc620ce7eaf206484ec2e0248dd79e9e700c57)

Conflicts:
	AndroidManifest.xml