Merge "[Settings] Mobile data usage code refactor" into rvc-dev am: 673251973b
am: ea4fc4af4c
am: 400c96b304
am: 643e2657f6
am: 2d7e2d4c24
Change-Id: I60700d07b351660e0080ea98f65da13226313271
This commit is contained in: