[automerger skipped] Revert "Replace field injection with constructor  injection." am: fb64691c44 am: 8ac66064eb -s ours

am skip reason: Merged-In I718113e103da303ddfb102b73c95f9a9b25da132 with SHA-1 65d5aa7e11 is already in history. Merged-In was found from reverted change.

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

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

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