Squashed Settings: Add time-context headers to the notification header [2/2]
and about Broken
Conflicts:
	res/values/slim_strings.xml
	src/com/android/settings/hyperion/NotificationDrawerQsSettings.java