Merge "Add device policy API to toggle Common Criteria mode"