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