Bug 870171 - Expire old data

WIP - still needs the associated AndroidSubmissionClient test.