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
Change-Id: If554e94a7a22bc12bfafef046ca7386a502bee0a
This commit is contained in: