Remember userId when stripping / rebuilding notification.
Remember userId when stripping / rebuilding notification.

ApplicationInfo.uid isn't enough because when system
posts notifications it Context.getUserId doesn't match
userId bit of ApplicationInfo.uid, so put back the
mOriginatingUserId.

Bug: 17002733
Change-Id: Ie3d8de121255bcb551cbe80c263e74f1a60b6f1c

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base