Merge "Add Callback to wake up from Dream when DreamActivity is destroyed." into tm-qpr-dev am: 358ad7d0

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



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