Merge changes I7af876ab,Idd79864d into tm-qpr-dev am: b968c7a46e

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

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