Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de
am: a281c7bf49
am: 9309d54815
am: 0b9a678924
Change-Id: Ib61657bebf5c740ba2ff0b704775599b36930985
This commit is contained in: