Merge "Call correct  API to disable Data Roaming during factory reset. Bug: 35956245 Test: Manual test" am: 574060b4b7 am: c0fb3d0762
am: 3f8bcbdb35  -s ours

Change-Id: I93195cd0585ef22268b5dece01825552b8435e2c