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