[automerger skipped] Merge "DO NOT MERGE Revert "Handle dream restart"" into...

[automerger skipped] Merge "DO NOT MERGE Revert "Handle dream restart"" into tm-qpr-dev am: 36c26294 am: 2d379eb1 -s ours am: 33e47c00 -s ours

am skip reason: subject contains skip directive

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



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