Revert submission 32704934-model-test-cleanup
Reason for revert: Droidmonitor created revert due to b/406588406. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:32704934-model-test-cleanup
Change-Id: Ieeb7f5b5699afeae27f946f060147bb68afc36e5