Merge "Clean up pre-revamped UI sections (2/3)" into udc-qpr-dev am: ba08abf7

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



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