Merge "DPMS: Fix Device Admin-related caller identity checks"