Clean up DataSettingsManager calls

Test: build
Bug: 223222696
Change-Id: I3b681c8efde2eb2a6e468e14e01b9297f20633c2
Merged-In: I3b681c8efde2eb2a6e468e14e01b9297f20633c2
1 file changed