[automerger skipped] Revert "Revert "Revert "Revert "Replace field injection with con..." am: 189647c407 -s ours am: eb7962e81e -s ours

am skip reason: Merged-In I563eb2e6b10c98f9f60c9680e5f50ff0541ad7eb with SHA-1 6d56fbbcc7 is already in history

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

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