Merge "Track non-foreground service notifs for appOps" into rvc-dev