Remove accidental early return

removeOldData would accidentally return early sometimes because the
lambda used in the filter included a "return" statement, and that seems
to be interpreted as a return for the whole method. Removing this and
just leaving the boolean value fixes this.

Bug: 205642821
Test: CTS test in topic
Change-Id: I544934ec989ddaa26a143521629143e5e82063aa