Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev