Merge "Do not stop dream service if dream activity is relaunching" into...
Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472 am: 4dfd3dcd am: fcfaee98 am: 263a8d82
Change-Id: Icc0eba1ae9d4daa4c3e23ccf78d17fd129b41ad7