Merge "New permissions for various device policy APIs" into main