[automerger skipped] Merge "Merge "Prevent NPE whlie leaving windowless dream...

[automerger skipped] Merge "Merge "Prevent NPE whlie leaving windowless dream service." into rvc-dev am: 3944050a am: 2a0437f8" into rvc-d1-dev-plus-aosp am: bc6a67ba -s ours am: a96adda9 -s ours
am skip reason: Change-Id I982c2f6fb1859e869732ef8795b61bf96e8cff64 with SHA-1 30efde6a is in history

Change-Id: I75da5611a93289c79e353874b667078240e9de97