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