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

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

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



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