Merge "Revert icon changes in "Modify quicksettings to have new location behavior." (b/10184973)"