[automerger skipped] DO NOT MERGE Revert "Handle dream restart" am: 36acacd2...

[automerger skipped] DO NOT MERGE Revert "Handle dream restart" am: 36acacd2 am: e051c1d1 -s ours am: c640d0f3 -s ours

am skip reason: subject contains skip directive

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



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