Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev am: 4908511b17
am: 8c87a8c0d6
am: cadc4c5dd6
am: 2c047f6560
Change-Id: Icda89e94c702cf21c45589994ce430a05158ec2f
This commit is contained in: