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

Change-Id: I82ddd309228f5e10c3fde31b7b3eb907f8c43d14