[automerger skipped] Revert "Revert "Revert "Replace field injection with constructor..." am: 40a871f48c am: 099d29f0b6 -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/+/3340780

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

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