[automerger skipped] Merge "Update Dagger2 dependencies." am: b34c1fe4 am:...

[automerger skipped] Merge "Update Dagger2 dependencies." am: b34c1fe4 am: e73de8cc -s ours am: bbf6c3bd -s ours am: 5f013116 -s ours am: 6c1df0c6 -s ours

am skip reason: Change-Id Ic3b43bb8247c6a7ebe4257651bcb5de51699c60a with SHA-1 fa22f610 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365961

Change-Id: Ic3924f71b7323cae4466089e1db7209ab88c63ef