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

[automerger skipped] DO NOT MERGE Revert "DO NOT MERGE Revert "Handle dream restart"" am: 316e02f3 am: 7b38f5ef -s ours am: 058e95fa -s ours

am skip reason: subject contains skip directive

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



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