Fix unit test failures when bundles ui flag is off

Generally mismatches where the code under test was changed to
use entryLegacy but the tests were still mocking with entry

Flag: EXEMPT fixes for flag off state
Fixes: 402875275
Fixes: 402868924
Fixes: 402872893
Fixes: 402873194
Test: it's all tests
Change-Id: Id739a4282dbefc8a8699459ec65b08ca8258ebad