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: f0f164dd am: 4bef2b2f am: 6b6d1253
Change-Id: I5f91c3d3ab1e108dd74858faa4060fc4a8541206