[automerger skipped] Merge "Don't poke user activity when dream ends" into...

[automerger skipped] Merge "Don't poke user activity when dream ends" into tm-dev am: 3f31afd1 am: 891ce789 -s ours

am skip reason: Merged-In If9b61cab3d5e21b89f3c0ab7fe541d46bc865f97 with SHA-1 3c7fa15a is already in history

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



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