Merge "Fix setAdministratorUids tests on Q"