Revert "Revert "Revert "Replace field injection with constructor..." am: 40a871f48c

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

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