Merge "DevicePolicy: Make uid parameter an int"