Merge "Merge "Add option to return a null Dagger graph" into tm-qpr-dev am: db19b396" into tm-qpr-dev-plus-aosp am: 2fb1d93a

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



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