Merge "Allow permission pre-grant files on OEM partition" into main