Merge "[flexiglass] Simplified Dagger setup." into udc-dev am: e778cbc5 am: f0242458

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



Change-Id: Ia2bec3e8a1315e2f04033270db83ca6598de065f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>