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: 55710482 am: a6fe5afc
Change-Id: I7a21b6131cbd07e706247beb8b3085ac75897fff