Make ApiModuleManagerTest::testAddModules un-risky

Change-Id: Idbea51cf45fc95676759e5ac9abb342701e5b551
Merge "Make ApiModuleManagerTest::testAddModules un-risky"