Merge "Notification history should always be accessed as uid 1000" into...
Merge "Notification history should always be accessed as uid 1000" into rvc-dev am: 6e44121b am: 43c5878b am: 60a8a122 am: 2f0dca39
Change-Id: I201eeba9001510dd3a45dcd904bf4409160d8618