Reverted change to TEST_MAPPING until the process is better understood.

Fixing functionality is more immediately important than ensuring the tests are ran in more places.

Test: No change in previous test performance.
Bug: 242296645
Change-Id: Iccf1c0b4dae02e9152f844e6186ef46963dd9844