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

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

Change-Id: I2b3ab07507d9a97e42a2f617c47d26e8645a38c7