Merge "Call correct  API to disable Data Roaming during factory reset. Bug: 35956245 Test: Manual test"