[automerger skipped] Replace field injection with constructor  injection. am: 4530819818 am: d12f0b29cb -s ours

am skip reason: Merged-In I718113e103da303ddfb102b73c95f9a9b25da132 with SHA-1 65d5aa7e11 is already in history

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

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