Merge "Extend DeviceOwner concept to accommodate ProfileOwners"