Variable stars and stellar populations in Andromeda XXI: II. Another merged galaxy satellite of M31?