Merge "Revert "Merge commit 'upstream/dagger-2.35.1^'"" am: 5882ce8935 am: 5480a6c05f am: 8630738d0a

Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705751

Change-Id: I41842348fb1a8f2595da4a7bd2a0b6792341b26a