Merge "[Settings] Code refactor for data usage" into rvc-dev am: abdeadf85d am: 148972e154 am: d84e25071c am: f4403d4a7b am: a8c35f4069 am: 849f477aad
Change-Id: Ibfd5c7ac91a8f622126f243b55479cc6fb017a02
This commit is contained in: