[automerger skipped] Fix checkbuild. am: c07254e6aa -s ours am: 03849d1638 -s ours

am skip reason: Change-Id I1a854f0d6be46cfd11ada58fa54589147e0f37d7 with SHA-1 5b5354d422 is in history

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

Change-Id: I18f66cb55f4b6da946e9270b4ef99501c382f1e3