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

Change-Id: Ia161c07f193abd7a093da13294dd5cf57161e8ec