Merge "Add compat change permissions to privapp list for intentresolver" into main