Merge remote-tracking branch 'base/kitkat-remix' into remix-legacy

Conflicts:
	core/java/android/provider/Settings.java
	services/java/com/android/server/NotificationManagerService.java