Merge "Fix DevicePolicyManagerServiceMigrationTest" into rvc-dev