Merge "2 minor DevicePolicyManagerService improvements." into sc-dev