Merge "Do not kill dream process when stopping dream" into udc-qpr-dev am:...

Merge "Do not kill dream process when stopping dream" into udc-qpr-dev am: 0a5435a5 am: 68e97eb9

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



Change-Id: I26e4bd0717efc96e5612cf17b2c54036d09294cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>