Merge "[Settings] Mobile data usage code refactor" into rvc-dev am: 7db5840dfe am: b17c7f9606 am: af7e7a0546 am: 24118ce607
Change-Id: I759b89142d3abc6b586e24bfffbdd566d753af91
This commit is contained in: