Settings: Notification Reminders (2/2)

PS4: Undo Unintentional PS3 change

Change-Id: I6be8d2267154c663a9977118f8e75e220cb7b9f6
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/bs_arrays.xml
	res/values/slim_strings.xml
	src/com/android/settings/beanstalk/NotificationDrawerQsSettings.java
Merge "Enable Back-key when go to Emergency call" into kitkat