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

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

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