Merge "Change clearDeviceOwnerApp to take a package"