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: 10662e54 am: c6c8c58f am: e18411cb
Change-Id: I3220c7719ff2bb274584c6e1ad8a9f89699ec7c7