Blacklist: Avoid crash when dialog dismissed via back button.

A user usually presses the back button only
when he/she does not want the changes to be saved.
Hence we need to revert the changes that took place
when the dialog is dismissed with back button.

Change-Id: Ifa3ef41f02f11d1e1627071532d8f915e3b445b6
Settings : Fix CustomScreenColor when picking an image

Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12
Automatic Translation Import

Change-Id: I37933742030c49132afdba0840291897ae280e50
Move protected apps strings to cm_strings

Change-Id: I7099ac4a817fa3db8d418b329b9a3344aea1da69
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy-staging