Merge "Fix DevicePolicyManagerServiceMigrationTest."