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

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



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