Merge "Fix PendingIntent hijacking for adb notifications." into rvc-dev am: 9a419cda am: c5724f35 Change-Id: I7468bbb2bb0b38d6b83031da37b89fe8baa86b97