[2/2] Prepare NotificationManagerService for new format

* Needed for blacklisting

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Missing back button on MultiSimSettings ActionBar

Fixed missing back button on ActionBar (default Settings behavior on
submenus) by adding "parentActivityName" property to MultiSimSettings
activity.

Change-Id: I60a1123be29d81c8232e0acee1ac9544bf9b32e6
[2/2] Add support for Peek app

Disable built in peek when Peek app is installed. Enable it again on app's unistall.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat

PS2: fix merge derp

Conflicts:
	src/com/android/settings/DisplaySettings.java

Change-Id: I1b058750e91bb5e41dd70a7796278e20d5618436
CM Theme engine [6/8]

Conflicts:
        res/values/custom_strings.xml
        res/xml/settings_headers.xml

Change-Id: I9a0c9da454b5239a43d287af9f2df8c4d042d466

Conflicts:

	src/com/android/settings/Settings.java