Merge "[Notif] Write AppUid earlier in NotificationInfo" into pi-dev am: f07d10e36b
am: f5c5e73023

Change-Id: I7e02e0dbb02e787ea3e738521c7b2df46b806eb3