Revert and fix "Fix for color picker pager getting clipped"

This reverts changes in Iad0573c378c6234febb55d7c054e2bb5716b1107.

Reverting change because CL created unexpected UI changes in the
original color section UI on Pixel 7 & Pixel 7 Pro. This new solution
was tested on a variety of devices and should fix the margin
issues without introducing unexpected UI changes to other
devices.

Bug: 221762001
Test: Manually verified on multiple devices
Change-Id: Ic9f54ca74aad136c6451b46249bd8ff8a8d42e66