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

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

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



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