Merge "Correctly render rows and columns in the grid options icons" into udc-qpr-dev am: 7ed2b3b7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24241536



Change-Id: Ia3d69f236aa941b72d50c217950d322c9967d37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>