Merge "Configure privapp perms for car activity resolver" into sc-dev