Change-Id: I2d928d1b5313b723450c8f5a45ff944b99dc3d5d Note: These changes are required for Data balance UI. Bug: 62349208 Test: make RunSettingsRoboTests -j40