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

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

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