[automerger skipped] Merge "Prevent dream service finishSelf before it was attached" into rvc-dev am: 2240431010 am: 462650df4c -s ours am: decb9bc608 -s ours
am skip reason: Change-Id I31bb4f32013b9fa0aa2263b94117060e4d3a7341 with SHA-1 b050ab8a78 is in history
Change-Id: I78839c90ab24464677cebc9f2309b574489e4147
This commit is contained in: