Merge "Fix PendingIntent hijacking for adb notifications." into rvc-dev am: 9a419cda53

Change-Id: Ica79fad48f82380977f9f5c4783a65590669336f