Merge "[2/2] Framework: instant led test" into cm-11.0

Signed-off-by: scott <scott@ubuntu>

Conflicts:
	services/java/com/android/server/NotificationManagerService.java

Change-Id: Ifd52255612b965118d15924c9ecfdfd8ad555824