Merge commit 'upstream/dagger-2.35.1^' am: 399f4f6113 am: c6f4971ee0 am: 849b6a83fd am: 5b1c4ba531

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

Change-Id: I9ab6cf0c82b4ae191df82b068f819785e936dd76