Merge "Marks two DeviceStateManagerService tests as flaky" into sc-v2-dev