Merge "Add API for instrumentations from root to override perms" into main