[automerger skipped] Revert "Revert "Revert "Replace field injection with constructor..." am: 5808615630 am: 285af6fb1b -s ours am skip reason: Merged-In I49dcf5fa23ed7e902b67c371a963f37d36d524d2 with SHA-1 2a1a6607b1 is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/3340779 Original change: https://android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/3342808 Change-Id: I7fff46f9b36948f074d4d1ac37143128c313556a Signed-off-by: Automerger Merge Worker <[email protected]>