Revert "Revert "Revert "Replace field injection with constructor..."

Revert submission 3340780-revert-3344343-revert-3343291-k2-upgrade-wpp-KWLCODKLEN-OROSEWLQYI

Reason for revert: b/378721958

Reverted changes: /q/submissionid:3340780-revert-3344343-revert-3343291-k2-upgrade-wpp-KWLCODKLEN-OROSEWLQYI

Change-Id: I72cbb41f978181d67398f38db96bd3c86beb2b5b
Merged-In: I718113e103da303ddfb102b73c95f9a9b25da132
3 files changed