Fix RollbackUnitTest when deleting rollback.

This fixes a test break introduced by ag/10173899.

An additional test is added to correctly test the new case of APEX data
being deleted.

Bug: 148961691
Test: atest RollbackUnitTest
Change-Id: I1fe168ff65a6b5011f2a0809bc5f410de1fb25db