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

Change-Id: I2236345bd09c0efd3ec920a008f8f7d513716297