Merge "DPM: Add API for granting apps access to keys"