Revert "Replace field injection with constructor  injection."

Revert submission 3343291-k2-upgrade-wpp

Reason for revert: Droidmonitor created revert due to b/378690400.

Reverted changes: /q/submissionid:3343291-k2-upgrade-wpp

Change-Id: I0cb90e6ac3d98f619dd1a892f6833f13829dc3da
2 files changed