Merge "Add null-checks to an optional dream service" into main am: 6696482e am: 05123d56

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



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