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