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

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



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