Merge "Remove privapp permission grant for dmservice"