Merge "Reset support for dark theme." into tm-qpr-dev am: f028725d am: 11e41699

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



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