Merge "Rename device aware permissions apis flag" into main