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

Change-Id: Iebdd0fcd9285eb5300844d892cfa908941f93b5b