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

Change-Id: I1413214b39e111e892a6c665d86d7dca6831147b