Merge tag 'android-4.3_r2.2' into jb43-r2.2

Android 4.3 release 2.2

Signed-off-by: Evan Anderson <evan1124@gmail.com>

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

Change-Id: Ic20e2b9a1e232ca25e6ca52c7584f389f09368ff
(cherry picked from commit bc661848345dc6b9c46e0b55dc85ca6c73beb3f1)