Merge "[Settings] Mobile data usage code refactor" into rvc-dev am: 673251973b
am: 80658af14e
am: 0ecf7a694d
Change-Id: Ibaa970c08a924878c82891761378c39011f03921
This commit is contained in: