Settings: Add missing up navigation in menus

Squashed forward port from cm-10.2

Change-Id: Ia9d51b53df8a3eb4c1b9dee1aeefb0b74eac0fde

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/profiles/NFCProfileWriter.java