Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de
am: 3134966696
am: e64c572d2d
Change-Id: If211021dd4de49a8f8c48375b9462f21883213dd
This commit is contained in: