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

Change-Id: I8f96b2aa8ca127380891f9a0a790224f092e9118