Merge "Merge "[Settings] Code refactor for data usage" into rvc-dev am: abdeadf85d am: 4738a05f1f" into rvc-d1-dev-plus-aosp am: 068df0dbf1 am: 1bbd9d3aaa am: 16797180ed
Change-Id: I71dc4590c53a082118fbb2019d992ba43263df5e
This commit is contained in: