Add TODOs to clean up tests that were duplicated for refactoring

Bug: 293587049
Bug: 311416205
Test: None
Change-Id: Ie7239faab63c63223f4199f7921ae2455ffb7896
3 files changed