[automerger skipped] Merge "Handle dream restart" into tm-qpr-dev am:...

[automerger skipped] Merge "Handle dream restart" into tm-qpr-dev am: 9d37599d am: 5294870c -s ours

am skip reason: Merged-In Ibd261038430a38f2fa519549372ddbf19d7cb36b with SHA-1 4bd7a879 is already in history

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



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