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: 943b0dc1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11366690

Change-Id: I6a42681e0656cedf4e5ad3cdf59bfb5f24c3b1be