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: 1966b34c am: b19a5e45
Change-Id: I3c0c5d0ec008e973a614e8c3b5f394f51cc88a8e