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

Change-Id: I8c89cbf67d648878c71c92574ce89090fc2de6bd