Merge "Fix PendingIntent hijacking for adb notifications." into rvc-dev am: 9a419cda am: c249f77f am: 4aba2d8d Change-Id: I4647d1dfd8397bee5aedc8d615b8915ca79efb92