[automerger skipped] Merge "Prevent dream service finishSelf before it was...
[automerger skipped] Merge "Prevent dream service finishSelf before it was attached" into rvc-dev am: 22404310 am: 462650df -s ours
am skip reason: Change-Id I31bb4f32013b9fa0aa2263b94117060e4d3a7341 with SHA-1 b050ab8a is in history
Change-Id: I68e3af7455fa724851c19069e21d0164e8408c8c