Revert "Update the number of quick settings columns for large sc..."

Revert submission 32634251-406007592

Reason for revert: Breaks tests b/406872477, b/406873597

Reverted changes: /q/submissionid:32634251-406007592

Fixes: 406872477
Fixes: 406873597
Bug: 406456758

Change-Id: I7180c207fc0bb303a360d81d89277df6a2587573