Bug: 377772352 Test: Presubmit Flag: EXEMPT test refactor Change-Id: I6e9ffb3dee913617ca9ad897504e8457cfbdccd6