Merge "Don't poke user activity when dream ends" into tm-dev am: 3f31afd1

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



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