Merge "Revert "Remerge: Device aware permission schema/policy changes"" into main