Merge "Adds "more option" section." into tm-qpr-dev am: cbad0d9bb5

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

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