[automerger skipped] Revert "Revert "Replace field injection with constructor  inject..." am: c00c07f112 am: 17ca516783 -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/+/3340780

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