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

Change-Id: I06db3710595420f259d8b37c48e2ed31550361c9