Bug: 119647479 Test: turn on/off feature flag and use DynamicSystem Change-Id: I2b2591f7a937cbe74d67cbfb95b778d2cfa32abb