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

Change-Id: Ica2a8b1cc55c88ba705e0213180f175da87e274b