Merge "Fix PendingIntent hijacking for adb notifications." into rvc-dev