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

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



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