Merge "Revert "Move ODPM file rule to pixel sepolicy"" into tm-dev