Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev am: b76f9472df

Change-Id: I5d0b57b38d31f6f466ef1ecf1b63b5e3a98248de